]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
util: Fix no-more-messages signal
authorRay Strode <rstrode@redhat.com>
Wed, 17 Jul 2013 17:06:10 +0000 (13:06 -0400)
committerRay Strode <rstrode@redhat.com>
Thu, 18 Jul 2013 13:23:11 +0000 (09:23 -0400)
Now thas hasPendingMessages is fixed, we need to also fix the associated
signal "no-more-messages"

https://bugzilla.gnome.org/show_bug.cgi?id=704347

js/gdm/util.js

index c79958de602dbd9f208bfcd395e69869358284b4..04b2d49f8d0ff4b1bd6bf61af25aadca6f618e9a 100644 (file)
@@ -167,11 +167,11 @@ const ShellUserVerifier = new Lang.Class({
             this._clearMessageQueue();
             this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
         } else {
-            let signalId = this._userVerifier.connect('no-more-messages',
-                                                      Lang.bind(this, function() {
-                                                          this._userVerifier.disconnect(signalId);
-                                                          this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
-                                                      }));
+            let signalId = this.connect('no-more-messages',
+                                        Lang.bind(this, function() {
+                                            this.disconnect(signalId);
+                                            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+                                        }));
         }
     },
 
@@ -426,21 +426,21 @@ const ShellUserVerifier = new Lang.Class({
             if (!this.hasPendingMessages) {
                 this._retry();
             } else {
-                let signalId = this._userVerifier.connect('no-more-messages',
-                                                          Lang.bind(this, function() {
-                                                              this._userVerifier.disconnect(signalId);
-                                                              this._retry();
-                                                          }));
+                let signalId = this.connect('no-more-messages',
+                                            Lang.bind(this, function() {
+                                                this.disconnect(signalId);
+                                                this._retry();
+                                            }));
             }
         } else {
             if (!this.hasPendingMessages) {
                 this._cancelAndReset();
             } else {
-                let signalId = this._userVerifier.connect('no-more-messages',
-                                                          Lang.bind(this, function() {
-                                                              this._userVerifier.disconnect(signalId);
-                                                              this._cancelAndReset();
-                                                          }));
+                let signalId = this.connect('no-more-messages',
+                                            Lang.bind(this, function() {
+                                                this.disconnect(signalId);
+                                                this._cancelAndReset();
+                                            }));
             }
         }